From: IOhannes m zmölnig Date: Thu, 21 Jan 2016 15:08:49 +0000 (+0100) Subject: Patch to not use z_uInt X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~385 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=4119285df8564ce6cbec6c42b90a76b1a6f8ad00;p=juce.git Patch to not use z_uInt --- diff --git a/debian/patches/no-ztypes.patch b/debian/patches/no-ztypes.patch new file mode 100644 index 00000000..a0b2aff3 --- /dev/null +++ b/debian/patches/no-ztypes.patch @@ -0,0 +1,42 @@ +Description: do not use z_uInt + the zlib/gzip consumers use a type z_uInt, which is nowhere actually defined. + use (uInt) instead +Author: IOhannes m zmölnig +Last-Update: 2015-01-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- juce.orig/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp ++++ juce/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp +@@ -87,8 +87,8 @@ + { + stream.next_in = const_cast (data); + stream.next_out = buffer; +- stream.avail_in = (z_uInt) dataSize; +- stream.avail_out = (z_uInt) sizeof (buffer); ++ stream.avail_in = (uInt) dataSize; ++ stream.avail_out = (uInt) sizeof (buffer); + + const int result = isFirstDeflate ? deflateParams (&stream, compLevel, strategy) + : deflate (&stream, flushMode); +--- juce.orig/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp ++++ juce/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp +@@ -126,8 +126,8 @@ + { + stream.next_in = data; + stream.next_out = dest; +- stream.avail_in = (z_uInt) dataSize; +- stream.avail_out = (z_uInt) destSize; ++ stream.avail_in = (uInt) dataSize; ++ stream.avail_out = (uInt) destSize; + + switch (inflate (&stream, Z_PARTIAL_FLUSH)) + { +@@ -136,7 +136,7 @@ + // deliberate fall-through + case Z_OK: + data += dataSize - stream.avail_in; +- dataSize = (z_uInt) stream.avail_in; ++ dataSize = (uInt) stream.avail_in; + return (int) (destSize - stream.avail_out); + + case Z_NEED_DICT: diff --git a/debian/patches/series b/debian/patches/series index 0ca28ba3..1c935826 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +no-ztypes.patch do-not-track.patch